Refactor dpnp includes and add extension example by ndgrigorian · Pull Request #2941 · IntelPython/dpnp

ndgrigorian · 2026-06-05T06:44:20Z

This PR proposes a refactor of dpnp's includes and the introduction of an example extension, to be tested to make sure examples using dpnp and dpnp.tensor can be written.

The usm_ndarray_constants.h header and dpnp4pybind11.hpp are moved to dpnp/include, removing a relative include and aligning with previous dpctl behavior.

Also introduces dpnp-config.cmake, which enables find_package(Dpnp) out of the box, which is installed with dpnp, and --cmakedir command line option, which leads to the CMake config.

Have you provided a meaningful PR description?
Have you added a test, reproducer or referred to an issue with a reproducer?
Have you tested your changes locally for CPU and GPU devices?
Have you made sure that new changes do not introduce compiler warnings?
Have you checked performance impact of proposed changes?
Have you added documentation for your changes, if necessary?
Have you added your changes to the changelog?

Enables find_package(Dpnp) out of the box

move dpnp4pybind11.hpp and usm_ndarray_constants.h into a top-level include directory, similar to original dpctl layout

makes include explicit

serves to test dpnp cmake integration

github-actions · 2026-06-05T07:41:12Z

View rendered docs @ https://intelpython.github.io/dpnp/pull/2941/index.html

coveralls · 2026-06-05T08:04:30Z

coverage: 78.101% (-0.02%) from 78.116% — add-libtensor-pybind11-example into master

github-actions · 2026-06-05T08:14:51Z

Array API standard conformance tests for dpnp=0.21.0dev0=py313h509198e_82 ran successfully.
Passed: 1356
Failed: 4
Skipped: 16

vlad-perevezentsev

LGTM
Thank you @ndgrigorian
A few minor comments below:

vlad-perevezentsev

Great job!
No more comments from my side
LGTM, thank you @ndgrigorian

antonwolfy · 2026-06-15T20:58:13Z

        help="Path to dpnp libtensor include directory.",
    )
+    parser.add_argument(
+        "--cmakedir",


Would it make sense to test --cmakedir / Dpnp_ROOT in the example also?

antonwolfy · 2026-06-15T21:01:46Z

+#
+
+if(NOT Dpnp_FOUND)
+    find_package(Python 3.10 REQUIRED COMPONENTS Interpreter Development.Module)


Would it make sense to have upper limit also?

Suggested change

find_package(Python 3.10 REQUIRED COMPONENTS Interpreter Development.Module)

find_package(Python 3.10...<3.15 REQUIRED COMPONENTS Interpreter Development.Module)

antonwolfy · 2026-06-15T21:05:17Z

 dpnp/**/*.pyd
 *~
 core
+*.so


We have a pattern with ...*so already above. Do we need to be more specific here and to ignore only ones generated in example folder?

antonwolfy · 2026-06-15T21:12:18Z

+
+      - name: Install example requirements
+        run: |
+          mamba install pytest dpcpp_linux-64">=2026.0.0" cmake ninja scikit-build ${{ env.TEST_CHANNELS }}


As an option we can add a dedicated env file to dpnp/enviroments folder and install all the requirements in Setup miniconda step

antonwolfy · 2026-06-15T21:28:10Z

+    Dpnp_INCLUDE_DIR
+    dpnp4pybind11.hpp
+    PATHS "${_dpnp_include_dir}" "${Python_INCLUDE_DIRS}"
+    PATH_SUFFIXES dpnp/include


Do we need to use NO_DEFAULT_PATH here ?

antonwolfy · 2026-06-15T21:59:06Z

+install(
+    FILES ${CMAKE_SOURCE_DIR}/cmake/dpnp-config.cmake
+    DESTINATION dpnp/resources/cmake
+)
+install(FILES ${CMAKE_SOURCE_DIR}/cmake/dpnp-config.cmake DESTINATION lib/cmake/dpnp)


We can reduce duplication:

Suggested change

install(

FILES ${CMAKE_SOURCE_DIR}/cmake/dpnp-config.cmake

DESTINATION dpnp/resources/cmake

)

install(FILES ${CMAKE_SOURCE_DIR}/cmake/dpnp-config.cmake DESTINATION lib/cmake/dpnp)

foreach(_dest IN ITEMS dpnp/resources/cmake lib/cmake/dpnp)

install(FILES ${CMAKE_SOURCE_DIR}/cmake/dpnp-config.cmake DESTINATION ${_dest})

endforeach()

antonwolfy · 2026-06-15T22:05:04Z

+
+# install dpnp4pybind11.hpp and usm_ndarray_constants.h into include folder
+install(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/dpnp/include/


It actually means the recurses into ALL subdirs. But there is another rule at dpnp/CMakeLists.txt:147-156 which installs the Cython-generated headers from the build.
Thus the rule will grab dpnp/tensor/_usmarray.h and _usmarray_api.h and install them to <prefix>/dpnp/include/dpnp/tensor. Exactly the same as rules at dpnp/CMakeLists.txt:147-156 do.

So the same files might be written twice to the same location.

We might need to specify explicitly:

install(FILES ${CMAKE_SOURCE_DIR}/dpnp/include/dpnp4pybind11.hpp ${CMAKE_SOURCE_DIR}/dpnp/include/usm_ndarray_constants.h DESTINATION dpnp/include)

or to add PATTERN "dpnp/tensor" EXCLUDE to the end of install command.

ndgrigorian added 4 commits June 4, 2026 20:10

Add and install dpnp-config.cmake

82a59d1

Enables find_package(Dpnp) out of the box

refactor dpnp includes

1547e62

move dpnp4pybind11.hpp and usm_ndarray_constants.h into a top-level include directory, similar to original dpctl layout

add dpnp4pybind11.hpp where transiently included

22fe46e

makes include explicit

add pybind11 extension

82d90b9

serves to test dpnp cmake integration

run pybind11 example in CI

c735f53

ndgrigorian force-pushed the add-libtensor-pybind11-example branch from 622aa32 to c735f53 Compare June 5, 2026 08:30

vlad-perevezentsev reviewed Jun 5, 2026

View reviewed changes

ndgrigorian added 4 commits June 5, 2026 08:32

pin compiler in example test run

5ce4ee9

address review feedback

a84e5fc

fix stray copyright date in use_dpnp_array setup.py

4c05f49

use two find_path calls in dpnp-config.cmake

020e5ea

ndgrigorian force-pushed the add-libtensor-pybind11-example branch from cae3b56 to 020e5ea Compare June 5, 2026 22:58

ndgrigorian marked this pull request as ready for review June 6, 2026 00:32

ndgrigorian requested a review from antonwolfy as a code owner June 6, 2026 00:32

ndgrigorian requested a review from vlad-perevezentsev June 6, 2026 00:32

vlad-perevezentsev approved these changes Jun 9, 2026

View reviewed changes

Comment thread .gitignore Outdated

Comment thread cmake/dpnp-config.cmake Outdated

address PR review

f162a9d

ndgrigorian requested a review from vlad-perevezentsev June 9, 2026 17:21

vlad-perevezentsev approved these changes Jun 9, 2026

View reviewed changes

Merge branch 'master' into add-libtensor-pybind11-example

4a4e5d2

antonwolfy added this to the 0.21.0 release milestone Jun 11, 2026

Merge branch 'master' into add-libtensor-pybind11-example

d0127f3

antonwolfy reviewed Jun 15, 2026

View reviewed changes

	find_package(Python 3.10 REQUIRED COMPONENTS Interpreter Development.Module)
	find_package(Python 3.10...<3.15 REQUIRED COMPONENTS Interpreter Development.Module)

Conversation

ndgrigorian commented Jun 5, 2026

Uh oh!

github-actions Bot commented Jun 5, 2026

Uh oh!

coveralls commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vlad-perevezentsev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

vlad-perevezentsev left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

coveralls commented Jun 5, 2026 •

edited

Loading

github-actions Bot commented Jun 5, 2026 •

edited

Loading